From bf272f7a9ae51f84ecbe3e2b6d468a7a3914298b Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Jul 2009 19:04:22 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 390475000a1..0db46676935 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* simple.el (deactivate-mark, activate-mark, set-mark): Don't call
+	x-set-selection if display-selections-p returns nil for the
+	current frame.
+
 2009-07-18  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
-- 
2.30.2